Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ss/builtin-cleanup' | Junio C Hamano | 2014-01-10 | 1 | -1/+5 |
|\ | |||||
| * | builtin/help.c: speed up is_git_command() by checking for builtin commands first | Sebastian Schuberth | 2014-01-06 | 1 | -0/+3 |
| * | builtin/help.c: call load_command_list() only when it is needed | Sebastian Schuberth | 2014-01-06 | 1 | -1/+2 |
* | | Merge branch 'js/lift-parent-count-limit' | Junio C Hamano | 2014-01-10 | 1 | -4/+4 |
|\ \ | |||||
| * | | Remove the line length limit for graft files | Johannes Schindelin | 2013-12-28 | 1 | -4/+4 |
* | | | Merge branch 'bm/merge-base-octopus-dedup' | Junio C Hamano | 2014-01-10 | 1 | -6/+26 |
|\ \ \ | |||||
| * | | | merge-base --octopus: reduce the result from get_octopus_merge_bases() | Junio C Hamano | 2013-12-30 | 1 | -1/+1 |
| * | | | merge-base: separate "--independent" codepath into its own helper | Junio C Hamano | 2013-12-30 | 1 | -6/+25 |
* | | | | Merge branch 'km/gc-eperm' | Junio C Hamano | 2014-01-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | gc: notice gc processes run by other users | Kyle J. McKay | 2014-01-03 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/oi-delta-base' | Junio C Hamano | 2014-01-10 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | cat-file: provide %(deltabase) batch format | Jeff King | 2013-12-26 | 1 | -0/+6 |
* | | | | | | Merge branch 'jk/sha1write-void' | Junio C Hamano | 2014-01-10 | 1 | -2/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | do not pretend sha1write returns errors | Jeff King | 2013-12-26 | 1 | -2/+0 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'nd/add-empty-fix' | Junio C Hamano | 2014-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add: don't complain when adding empty project root | Nguyễn Thái Ngọc Duy | 2013-12-26 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'tm/fetch-prune' | Junio C Hamano | 2014-01-10 | 1 | -10/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch --prune: Run prune before fetching | Tom Miller | 2014-01-03 | 1 | -5/+5 |
| * | | | | | | fetch --prune: always print header url | Tom Miller | 2014-01-03 | 1 | -5/+27 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mh/path-max' | Junio C Hamano | 2014-01-10 | 2 | -31/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX | Jeff King | 2013-12-19 | 1 | -14/+24 |
| * | | | | | | prune-packed: use strbuf to avoid having to worry about PATH_MAX | Junio C Hamano | 2013-12-17 | 1 | -17/+21 |
* | | | | | | | Merge branch 'cc/replace-object-info' | Junio C Hamano | 2014-01-10 | 2 | -8/+61 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbols | Christian Couder | 2013-12-30 | 1 | -10/+14 |
| * | | | | | | | builtin/replace: unset read_replace_refs | Christian Couder | 2013-12-12 | 1 | -0/+2 |
| * | | | | | | | builtin/replace: teach listing using short, medium or full formats | Christian Couder | 2013-12-12 | 1 | -7/+54 |
| * | | | | | | | sha1_object_info_extended(): add an "unsigned flags" parameter | Christian Couder | 2013-12-12 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/negative-pathspec' | Junio C Hamano | 2014-01-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Support pathspec magic :(exclude) and its short form :! | Nguyễn Thái Ngọc Duy | 2013-12-06 | 1 | -1/+4 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-12-30 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | for-each-ref: remove unused variable | Ramkumar Ramachandra | 2013-12-30 | 1 | -2/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'tg/diff-no-index-refactor' | Junio C Hamano | 2013-12-27 | 1 | -5/+53 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: avoid some nesting | Thomas Gummerer | 2013-12-16 | 1 | -18/+17 |
| * | | | | | | | diff: don't read index when --no-index is given | Thomas Gummerer | 2013-12-12 | 1 | -2/+5 |
| * | | | | | | | diff: move no-index detection to builtin/diff.c | Thomas Gummerer | 2013-12-12 | 1 | -3/+49 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/cat-file-regression-fix' | Junio C Hamano | 2013-12-27 | 1 | -10/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cat-file: handle --batch format with missing type/size | Jeff King | 2013-12-12 | 1 | -1/+10 |
| * | | | | | | | cat-file: pass expand_data to print_object_or_die | Jeff King | 2013-12-12 | 1 | -10/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/rev-parse-double-dashes' | Junio C Hamano | 2013-12-27 | 1 | -1/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: be more careful with munging arguments | Jeff King | 2013-12-09 | 1 | -1/+5 |
| * | | | | | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 1 | -0/+10 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 | 1 | -22/+62 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | push: also use "upstream" mapping when pushing a single ref | Junio C Hamano | 2013-12-05 | 1 | -0/+11 |
| * | | | | | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-05 | 1 | -2/+38 |
| * | | | | | | builtin/push.c: use strbuf instead of manual allocation | Junio C Hamano | 2013-12-03 | 1 | -21/+14 |
| |/ / / / / | |||||
* | | | | | | Sync with 1.8.5.2 | Junio C Hamano | 2013-12-17 | 1 | -4/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 1 | -10/+7 |
| |\ \ \ \ \ | |||||
| * | | | | | | cmd_repack(): remove redundant local variable "nr_packs" | Michael Haggerty | 2013-12-17 | 1 | -4/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' | Junio C Hamano | 2013-12-17 | 1 | -3/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git fetch-pack: add --diag-url | Torsten Bögershausen | 2013-12-09 | 1 | -3/+11 |