summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * convert "enum date_mode" into a structJeff King2015-06-2923-77/+97
| * show-branch: use DATE_RELATIVE instead of magic numberJeff King2015-06-291-1/+1
* | Merge branch 'pt/am-tests'Junio C Hamano2015-08-034-0/+313
|\ \
| * | t3901: test git-am encoding conversionpt/am-testsPaul Tan2015-07-201-0/+62
| * | t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-201-0/+19
| * | t4150: tests for am --[no-]scissorsPaul Tan2015-07-201-0/+48
| * | t4150: am with post-applypatch hookPaul Tan2015-07-201-0/+38
| * | t4150: am with pre-applypatch hookPaul Tan2015-07-201-0/+33
| * | t4150: am with applypatch-msg hookPaul Tan2015-07-201-0/+35
| * | t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-201-0/+13
| * | t4150: am --resolved fails if index has no changesPaul Tan2015-07-201-0/+12
| * | t4150: am refuses patches when pausedPaul Tan2015-07-201-0/+14
| * | t4151: am --abort will keep dirty index intactPaul Tan2015-07-201-0/+15
| * | t4150: am fails if index is dirtyPaul Tan2015-07-201-0/+12
| * | t4150: am.messageid really adds the message idPaul Tan2015-07-071-0/+12
* | | Merge branch 'sg/bash-prompt-untracked-optim'Junio C Hamano2015-08-032-1/+26
|\ \ \
| * | | bash prompt: faster untracked status indicator with untracked directoriessg/bash-prompt-untracked-optimSZEDER Gábor2015-07-201-1/+1
| * | | bash prompt: test untracked files status indicator with untracked dirsSZEDER Gábor2015-07-201-0/+25
* | | | Merge branch 'cb/uname-in-untracked'Junio C Hamano2015-08-031-1/+1
|\ \ \ \
| * | | | untracked: fix detection of uname(2) failurecb/uname-in-untrackedCharles Bailey2015-07-171-1/+1
* | | | | Merge branch 'se/doc-checkout-ours-theirs'Junio C Hamano2015-08-031-0/+15
|\ \ \ \ \
| * | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirsSimon A. Eugster2015-07-121-0/+15
* | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string'Junio C Hamano2015-08-033-68/+92
|\ \ \ \ \ \
| * | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-153-68/+92
* | | | | | | Merge branch 'mh/fast-import-optimize-current-from'Junio C Hamano2015-08-031-12/+17
|\ \ \ \ \ \ \
| * | | | | | | fast-import: do less work when given "from" matches current branch headmh/fast-import-optimize-current-fromMike Hommey2015-07-131-12/+17
| |/ / / / / /
* | | | | | | Merge branch 'kn/tag-doc-fix'Junio C Hamano2015-08-031-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fixKarthik Nayak2015-07-101-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mh/fast-import-get-mark'Junio C Hamano2015-08-033-10/+75
|\ \ \ \ \ \ \
| * | | | | | | fast-import: add a get-mark commandmh/fast-import-get-markMichael Haggerty2015-07-013-10/+75
* | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-035-6/+338
|\ \ \ \ \ \ \ \
| * | | | | | | | git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-303-0/+116
| * | | | | | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-304-3/+197
| * | | | | | | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-304-3/+25
* | | | | | | | | Merge branch 'jc/commit-slab'Junio C Hamano2015-08-032-13/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-slab: introduce slabname##_peek() functionjc/commit-slabJunio C Hamano2015-05-222-13/+49
* | | | | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-035-2/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log: add "log.follow" configuration variableDavid Turner2015-07-095-2/+49
* | | | | | | | | | | Merge branch 'gp/status-rebase-i-info'Junio C Hamano2015-08-032-31/+346
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: add new tests for status during rebase -igp/status-rebase-i-infoGuillaume Pagès2015-07-061-0/+87
| * | | | | | | | | | | status: give more information during rebase -iGuillaume Pagès2015-07-062-0/+225
| * | | | | | | | | | | status: differentiate interactive from non-interactive rebasesGuillaume Pagès2015-06-302-15/+18
| * | | | | | | | | | | status: factor two rebase-related messages togetherGuillaume Pagès2015-06-301-16/+16
* | | | | | | | | | | | Merge branch 'jk/cat-file-batch-all'Junio C Hamano2015-08-033-35/+137
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-allJeff King2015-06-263-12/+18
| * | | | | | | | | | | | cat-file: add --batch-all-objects optionJeff King2015-06-223-2/+77
| * | | | | | | | | | | | cat-file: split batch_one_object into two stagesJeff King2015-06-221-16/+23
| * | | | | | | | | | | | cat-file: stop returning value from batch_one_objectJeff King2015-06-221-12/+6
| * | | | | | | | | | | | cat-file: add --buffer optionJeff King2015-06-222-7/+26
| * | | | | | | | | | | | cat-file: move batch_options definition to top of fileJeff King2015-06-221-6/+7